Fix assignment of time in scroll events. (Sven Neumann, #75574)

Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
        of time in scroll events. (Sven Neumann, #75574)

diff --git a/ChangeLog b/ChangeLog
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 632697786b4ca62d1afdc68235a4865df03090bd..877f0ab19b9b81b005bc8ab17451aff6423fd1df 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Mar 20 10:55:56 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment
+       of time in scroll events. (Sven Neumann, #75574)
+
 2002-03-20  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index b903cf7b79704bf88f4ed0b23f5caa0ebe653f82..0197c62338ce9bdc87f95d60029aed8c78ae7b6a 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -718,7 +718,7 @@ gdk_event_translate (GdkEvent *event,
             event->scroll.direction = GDK_SCROLL_RIGHT;
 
          event->scroll.window = window;
-         event->scroll.time = xevent->xbutton.x;
+         event->scroll.time = xevent->xbutton.time;
          event->scroll.x = xevent->xbutton.x + xoffset;
          event->scroll.y = xevent->xbutton.y + yoffset;
          event->scroll.x_root = (gfloat)xevent->xbutton.x_root;